Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix an type wrong #85

Merged
merged 4 commits into from
Apr 8, 2019
Merged

fix an type wrong #85

merged 4 commits into from
Apr 8, 2019

Conversation

JonathanHouten
Copy link
Contributor

should be LPCWSTR

in wincrypt.h

#define CertOpenSystemStore __MINGW_NAME_AW(CertOpenSystemStore)

and

#define __MINGW_NAME_AW(func) func##W

and

  WINIMPM HCERTSTORE WINAPI CertOpenSystemStoreW (HCRYPTPROV_LEGACY hProv, LPCWSTR szSubsystemProtocol);

@JonathanHouten
fix an type wrong
55d3710 
should be LPCWSTR
@CLAassistant
Copy link

CLAassistant commented Apr 7, 2019 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@wongsyrone
Copy link
Contributor

NAK. You should use _T instead of assuming _UNICODE is defined

https://docs.microsoft.com/en-us/cpp/text/generic-text-mappings-in-tchar-h?view=vs-2019

@GreaterFire
Copy link
Member

I was following the example specified here.

@GreaterFire
Copy link
Member

To resolve AppVeyor regression, please detect the build environment with ifdef (https://stackoverflow.com/questions/17493759/how-can-i-detect-g-and-mingw-in-c-preprocessor) and select the parameter types respectively in each block.

@JonathanHouten
handle the unicode more properly
4378461 
only msvc have _T macro while mingw dont
GreaterFire
GreaterFire reviewed Apr 8, 2019
View reviewed changes
src/service.cpp Outdated Show resolved Hide resolved
@GreaterFire GreaterFire merged commit c998bea into trojan-gfw:master Apr 8, 2019
GreaterFire added a commit that referenced this pull request Apr 8, 2019
@GreaterFire
Revert "Fix type error in MinGW (#85)"
3a6fac5 
This reverts commit c998bea.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GreaterFire GreaterFire GreaterFire approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JonathanHouten @CLAassistant @wongsyrone @GreaterFire